Snap for 5680585 from 7391187b99acf66fedcc686aa725d084474bb67b to rvc-release

Change-Id: I6d20c3e9a99e7a055aeaa3ff0fdaecfe31d0ba21