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

Change-Id: Id4b9f8029cb5c0637b717537a5f6713c22e6f783