Merge branch android10-qpr1-release

Change-Id: I50c7396db8c9b1b532472bc5c031db25dd0a2827