Snap for 7019547 from 9cfac9c44cea2d86a3ed4b2d94603c9890d23d3b to rvc-qpr2-release

Change-Id: Ib60900edcd4ace4e6557a8ecb616f27004c53ab2