Merge branch android10-qpr1-release

Change-Id: I272909a0812fa63c961ec9c5633a8e0e21dcd0f8