Merge cherrypicks of [19211974] into tm-release.

Change-Id: I56b6a81fd3913341ba4abef5dc3d995066aaa725