Merge cherrypicks of [19205917] into tm-release.

Change-Id: Ic8143a5d9afc904e785ec6e73365e4a56f1acb63