Merge branch android10-qpr1-release

Change-Id: I819e9b03f5e24f0aa0441b82574f6b50d7e59f71