Merge branch android10-qpr1-release

Change-Id: I24a2f9385216473b8a25b790db3d244f5912bfa5