Merge "Adding target name to their manifests for Hexagon and Flower" into rvc-dev