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: 2f3d2820 am: a3dc1799
Change-Id: Ia845c671c6e707d9b8e74f2984f3d44e397f9e33