Merge branch android10-qpr1-release

Change-Id: Id2f37e2db80b46ec14e5a5787c3b7be2fca3baec