Merge cherrypicks of [19068451] into tm-release.

Change-Id: Ie55b625e63b32d826878636f75cd3fde18927a4b