Merge cherrypicks of [19129308, 19129309] into tm-release.

Change-Id: I92882b42e785523d053b058da8e4c052a32664ce