Merge branch android10-qpr3-release

Change-Id: Ie0006df82c291e51a4a87029068320c038f740aa