Snap for 7075293 from d53974f425d57fd205cd81458a6f3929170ca86e to rvc-qpr3-release

Change-Id: Idfb56d05f476b1849a644eb2f372db4a756c8a79