Merge branch android10-qpr3-release

Change-Id: I94aae1833c3cb5b5f7971a7d89a3ca480441d31b