Merge cherrypicks of [19716519, 19716933] into tm-release.

Change-Id: I88f1a47a0e7b422e6a0e216ea6693d46a5044478