Merge branch android10-qpr1-release

Change-Id: Ia4709545276d4ada0004a3e822eb6b0bece8c6e3