Merge branch android10-qpr1-release

Change-Id: I3b31bc621b8ad6941d0cdfe983f7760f632f775b