Snap for 7183002 from 74b4ee6f5237e5254e008900f4db02cd559d014f to rvc-qpr3-release

Change-Id: I13ef8f95bcf37ead990dda489a1306c98c17aa11