Merge branch android10-qpr3-release

Change-Id: I9a49bc720a7507997deb7525736b5b8f49475365