Merge cherrypicks of [19290707] into tm-release.

Change-Id: Ic094a0a2c0caf886084916a9bd506c985cb6603b