Merge branch android10-qpr1-release

Change-Id: Icf562a3ff26e78a835b185859e3e9a240c5c442b