Merge cherrypicks of [18800448] into tm-release.

Change-Id: Ia6a5b67c67548a1e7aa23b71143329ede47724b8