Merge branch android10-qpr1-release

Change-Id: I2d43925cc9165aa5686394a7039d59303ba54f05