Merge branch android10-qpr1-release

Change-Id: I6045135b677614cb28d9601534f5c73cf7232446