Snap for 7028231 from ec6890bdabae6a8f231c1fbb0dd5c0de5c929c17 to rvc-qpr2-release

Change-Id: Icf1b0aa60f42a5f945db27c5080ef118b61c8c33