Merge cherrypicks of [19415386] into tm-release.

Change-Id: I3ba521e84da412c63801bf94c1276ca8b926c8da