Snap for 6138855 from 97b7ce377175bda4380228372eacaf1d9193fcd4 to rvc-release

Change-Id: I625568df77d12bf1290dea9f50a3f4b7eee318bc