Merge branch android10-qpr1-release

Change-Id: I6f851429cdd9ab86c27822d1eae0742deff4da33