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 am: 8561f490 am: 6006b928
Change-Id: Icd093e99fc2d34fa80eccca6f6424dbe77bcdd13