Merge branch android10-qpr3-release

Change-Id: Ib40acdec0d53680207c13f80af97c22582848655