Merge branch android10-qpr1-release

Change-Id: I2b44e4722da02ae27ffba9b1b7169a61b9d73050