Merge branch android10-qpr3-release

Change-Id: If6e141530928feaa4b6f4894a7c49d5dde87f033