Merge cherrypicks of [19504916] into tm-release.

Change-Id: I97a93f8c30736538e5f9df172cc68a66a9d30946