Merge branch android10-qpr1-release