Merge branch android10-qpr1-release

Change-Id: Idfa4c1e09d00314e771fc023e1490f51dd8c57a6