Snap for 5975424 from 77cb85583fe28328f2a1f6e7e5b04808a712450c to rvc-release

Change-Id: I24cc84e6fd200130afb7c7b9d26e15c4e10ed32b