Merge branch android10-qpr2-release

Change-Id: I5f93b92f5f7d3dd5325f8d17a3d12648c2fbf523