Snap for 7239954 from e939f88ada8ff9c23ade54bd042d226ddd95d92b to rvc-qpr3-release

Change-Id: I2560eb900aed829647c9e1b39d83de6be09af2c6