Merge cherrypicks of [19008482] into tm-release.

Change-Id: I95c0ce0aa7f5a8a3987f6cbc444f105139100fce