Merge branch android10-qpr3-release

Change-Id: Ib969d44e30d138e90430af2814daf3738dc15361