Merge cherrypicks of [19423651, 19634561] into tm-release.

Change-Id: I395fc4d63ef9a03042fd257fb46d285c1f2b3c5a