Merge cherrypicks of [19990545] into tm-release.

Change-Id: Iba2e6894aff3c01f3cf577ec5500f8ee2efabc99