Merge branch android10-qpr2-release

Change-Id: Icc66a0ed87b47afd1c113a31c14ca1d2abcea222