Snap for 7022639 from 9233d2dfb8a3742d9b8986163760dae763e2c7f7 to rvc-qpr2-release

Change-Id: Ice72c98b59c3ddd8fe70e184984231f83abfb9fe