Merge cherrypicks of [19912057] into tm-release.

Change-Id: Ic177f3d63b488d46bebb72a64bfb5e4d1e639b41