Merge branch android10-qpr1-release

Change-Id: I550a727c70c1a33f876edb50a938ca9965f20793