Merge cherrypicks of [19734446] into tm-release.

Change-Id: Ic35e2f55346642943a18c8d056defb70143b75c3