Snap for 7269201 from e68bfe9a73fad724445c65c289027821f982f9a2 to rvc-qpr3-release

Change-Id: I4121184ff7bb28e9ee2d7e029d6d875833c46504