Merge cherrypicks of [19419128, 19459610, 19221774] into tm-release.

Change-Id: I1fc8b7382f6733993524bd385107000411d7e967