Merge branch android10-qpr1-release

Change-Id: Ia9616884a396ab7fa07a92a9b0c995a69a009f98