Merge branch android10-qpr1-release

Change-Id: I2abdec93760c036a88e6c78c94a7d71e04c129de