Merge cherrypicks of [19492269] into tm-release.

Change-Id: I5aab74f5d77cb1842216b53c7f6e10841c4d9243