Snap for 7193154 from 2d174cc2740257726122d4dc1fa9c7ec2b958c51 to rvc-d2-release

Change-Id: I20c8a985dd3ccf2e19aa8928236e26e17b64499e