Merge branch android10-qpr1-release

Change-Id: Ie31b3294517c0271392c1fcec206a99fdec7c966