Snap for 7266183 from 6d587c257c9684f25771d4502e38f2d522efceae to rvc-qpr3-release

Change-Id: Ia7ede8166d1e2ce6303fb080c3c368e58878c7fa