Snap for 6823548 from 18c9ec4100aabc43496b929aaae1c117510c790e to rvc-qpr1-release

Change-Id: I15f4724eb8277aa3f835d03a0c145e7a4586feac