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

Change-Id: I32937018b0d9e451e246a85e5161d386d6e3bb56