Merge branch android10-qpr1-release

Change-Id: I0f6f950fe6a0d92cd5b867c4a1a105a90adc1593