Merge branch android10-qpr1-release

Change-Id: I8ad5504804adc2d4ae2acbe8dd28bb21ff9b342f