Merge branch android10-qpr1-release

Change-Id: Ib856121207d869ee779c4be66a00c23507db10d8