Snap for 6862191 from 434bffe9e26c394e91363555da0c7fc13b6a4a41 to rvc-qpr1-release

Change-Id: I7ae89f7bb0b8945411f51f7d7c8c76fdfb31b52b