Merge cherrypicks of [19170127] into tm-release.

Change-Id: I4341b8873634927e21ea9ef107c4a77e0cf36284