Snap for 5643956 from 7922012811c66ac3caddc2763df936f39a0cb811 to rvc-release

Change-Id: Id49b8b99ca7c199c8a79237c6bb258020a00e820