Merge cherrypicks of [19300203, 19912227] into tm-release.

Change-Id: Ic5ed1e636b3a107b081b4d20e332f8eb0deec6a4