Snap for 6145313 from 807099bab08a42cc3478fa0fcb591cd48fe13fdd to rvc-release

Change-Id: I7994b33b5b54200c9142963364367ba1e41ec173