Snap for 6516196 from ec4d8a9ca673e76a55b92db7c81ca5b4406aecff to rvc-d1-release

Change-Id: I2c2aab9fd233014a870a5f9902a7494a315c6b35