Merge branch android10-qpr1-release

Change-Id: Ie866ed0110bf8572d349c1c92a1742798642e0ba