Merge branch android10-qpr2-release

Change-Id: Ie71f09c3328efd4ba80caa719aa9e0617ab49234