Merge branch android10-qpr1-release

Change-Id: I61d1c96858bca988e1365c5f4c86cdd9bd99e9d8