Merge branch android10-qpr2-release

Change-Id: I9a264ab986d5661594aafac0f25801e4f1e259ab