Merge branch android10-qpr1-release Change-Id: I1e1218f66089f06185dcfd4aa85659be1390b6ec