Snap for 6740034 from 8e710ca120a7692db9bf7a7ab5eb3548ad65ed1d to rvc-qpr1-release

Change-Id: Id9cc9a25cf6bc06c5e81108b78b6f78c859719b7