Merge "Merge "Adding target name to their manifests for Hexagon and Flower"...
Merge "Merge "Adding target name to their manifests for Hexagon and Flower" into rvc-dev am: fdb5bdbf am: 60dcb241" into rvc-d1-dev-plus-aosp am: e5949af6
Change-Id: I6410650baa28443f126045a6cbcd68a97fda4b08