Merge branch android10-qpr1-release

Change-Id: I320fcc8e22d8c02a93bfe55f824833e40504646b