Merge branch android10-qpr1-release

Change-Id: If00014e28d99a0863258d9c2c70e66c8921b341e