Merge branch android10-qpr2-release

Change-Id: Ib144ef7a93d9810f960ca13ed427e9a660c4be2e