Merge branch android10-qpr1-release

Change-Id: I17852251f55b2f55b4cfae378bdc05dd51435059