Snap for 6935026 from 226bd0313ecb7ad236b4c0cfcf1e636aeb345df9 to rvc-qpr2-release

Change-Id: I7332187cce59e60d08f7b1be933cc0dae1962d72