Merge branch android10-qpr1-release

Change-Id: Ib70e910e8544713e3316123512cfe4bad822d456