Merge branch android10-qpr2-release

Change-Id: Ic74d008f81f74d1450090d8c44c4e09ce65a052a