Merge branch android10-qpr3-release

Change-Id: I1a04b3da2cb4ebd0c990ee55c14255ee21038bf5