Merge cherrypicks of [19047366, 19066851] into tm-release.

Change-Id: I5267656075a94645e3cfb22ba57034f0d6b1ae0f