Merge branch android10-qpr2-release

Change-Id: I38d6ddce47b8e8f1779ce364d463c453e0ffe1a2