Merge branch android10-qpr2-release

Change-Id: I1c78f211d13c7b6c21ad119650fbf597a8a74b7b