Snap for 5900950 from 9c9fbca54fc20f04c4202166c95762f8d9fca0f3 to rvc-release

Change-Id: Ie2af7b2f856034e01637877c7a624ec4f1bcd99a