Merge branch android10-qpr3-release

Change-Id: Id0de59ec0f2a90c18d223cd55b3023c50325cb0a