Snap for 6657150 from 464625b5edb96a5907ae0a73d6528de3f8d92dc7 to rvc-release

Change-Id: Ib412f0d327c311a967aa623d98e1e1a74cfdbc47