Merge cherrypicks of [19237539, 19250789, 19205810] into tm-release.

Change-Id: Ib2ef697e5ec64e15c41d3f127a70351773ab2b88