Merge branch android10-qpr2-release

Change-Id: I1377d4d5a95320d88cfeac9286e4dad40ef8bf21