Snap for 7252659 from 3c8e09045598314506ceefa19a0b163ea5bb1304 to rvc-qpr3-release

Change-Id: I063534d34426d65b69bb158a1cf3c6c2393f96ca