Merge branch android10-qpr1-release

Change-Id: I843303f44e027c9d7da5c8a9bfdd0682931a83a1