Merge cherrypicks of [19272886] into tm-release.

Change-Id: I54979ee7338723666e69321777df2f07829e2b4b