Merge cherrypicks of [19100090] into tm-release.

Change-Id: I31a10677963fd8f905a26af1bd546f62fbc8e677