Merge cherrypicks of [19460689] into tm-release.

Change-Id: I2892dbb05d1889b91ac46f696105207f764ab0ad