Merge branch android10-qpr1-release

Change-Id: I3406a5b1f0ac642b35c3f5d81737d09edc792687