Resolve duplicated requirement names in metadata
Change-Id: I1c486964fb99e259d42346cbbe591cd7e32cb070 Closes-Bug: #1872457