Merge cherrypicks of [19911939, 19911957] into tm-release.

Change-Id: I5441d080c25d84492a1ce66df1ac3a3faecdbafa