Snap for 6707956 from f69e01a44087e935177c54e77adf00a6cc6caa9c to rvc-qpr1-release

Change-Id: I9e4ce4d37701092f3ca82055ec80d4a28f1a3cfa