Merge branch android10-qpr1-release

Change-Id: Ie6933e65fc91d4c558adec8f3b3bb85867082578