Merge cherrypicks of [19630898] into tm-release.

Change-Id: I34908bdaf5568d3fc6933df542c0f05f3b52b0a0