Snap for 5969935 from 9143314da3963cbec21a59a4f0c6202ae99c3cb6 to rvc-release

Change-Id: I44e53e72be69223eb3b889e67ff911213dc8613f