Merge branch android10-qpr1-release

Change-Id: I121dbde206347e8d51d092204d81dde78050759c