Depends-On: Ic7c1817671467f4ec2ef823f52e165c2c1f230ca Change-Id: I94998e5885fae927a5637ef67a7930e2dd19a8ee Related-Blueprint: services-yaml-flattening