Merge branch android10-qpr3-release

Change-Id: Ibc7b1382fbf2fef3fe7dc5cd7b2db4cfe7397ee2