Merge branch android10-qpr3-release

Change-Id: I987fe0755360f556e40fda7528c41720788f4cf8