Merge cherrypicks of [19099993] into tm-release.

Change-Id: I70dfac435ca4760524580dc186abdafae2ae2491