Merge cherrypicks of [19460729] into tm-release.

Change-Id: Idff9a9d77b7985c4b5762bcbb5c279438cdc9222