Merge branch android10-qpr2-release

Change-Id: Ia8d6d95a0d9bee651fa6816426cee7a8ef547cd5