Snap for 6869386 from 030a44d91ab2d365ae33c203a42371121c24f099 to rvc-qpr1-release

Change-Id: Ibb9aa0c1554f4d42085c25fbeaf699d05e1a6e1a