Merge cherrypicks of [19014071] into tm-release.

Change-Id: Ie4ceee309cb7dc06180cd6e4e8d285d1a8f04568