Merge cherrypicks of [19197146] into tm-release.

Change-Id: Ie7db4368ca393c49f57354842ad8fbb4a7ea7a30