Merge branch android10-qpr3-release

Change-Id: I3fc73b221520c7d63c58c4046f95919eb1bdf3d3