Snap for 5434517 from 232ac2b689eb2531a75f707635233809910c5999 to rvc-release

Change-Id: I0cbe23b42fd12cc13ef44db8f9b2a3af8819b391