Snap for 6881776 from 669090928a6a6e87f36d07d63c14ea1b97f38d37 to rvc-qpr1-d-release

Change-Id: I96fc3863a8828793d09ba565dd541a158bdfdfda