Merge branch android10-qpr1-release

Change-Id: I74bf472c6623e8d6f75e55ba682c7a80e8938202