Merge cherrypicks of [19098516] into tm-release.

Change-Id: I08dbc4c9e431237921e57cd49c5d9693bc7f9f59