Merge cherrypicks of [19628804, 19629901] into tm-release.

Change-Id: I4302b27875a6c0e8da9b4cdb9e54d01e0581daf8