Merge cherrypicks of [19591070] into tm-release.

Change-Id: I928b7e7171ac6bd3f77520ba5f92b369a09e23cf