Merge branch android10-qpr3-release

Change-Id: I102d513d39d57de36d93606c91319dcb148ca350