Snap for 5511049 from 61853ca083e132623c03ff17ff0f132911302cc4 to rvc-release

Change-Id: I3e6d4e7b6e7094f007aea0c0e52104bf8f570154