Merge branch android10-qpr2-release

Change-Id: I67f4667b1657badd2a30714506846a01b3d65d1c