Merge branch android10-qpr1-release

Change-Id: I6087b39d5410889e91be3dcc87fc0b8fd65b154a