Merge "Adding target name to their manifests for Hexagon and Flower" into...
Merge "Adding target name to their manifests for Hexagon and Flower" into rvc-dev am: fdb5bdbf am: 60dcb241 am: a81a49c0
Change-Id: I490b4921bd0f96905bd196454fc28709eb8a37ff