Snap for 5434517 from 5a893728a2bc7a12b6288d9f47060f4ba2a437da to rvc-release

Change-Id: I9b407d366fccef19304bc21b3eb63de024d1f988