Merge cherrypicks of ['ag/20259323'] into tm-qpr1-release.

Change-Id: Ie6904f175523d64a666e6b04fb26ade8b28b8bd5