Merge branch android10-qpr3-release

Change-Id: I9b7933ef45ae902654e1944251acb9438c2e24c7