Snap for 5969935 from 8c319c5244eec7007cfef7054da3c9e28faff4c9 to rvc-release

Change-Id: Ia078ae035642e1f3edf6a5d1c3db5d6b39138614