Merge cherrypicks of [19355798] into tm-release.

Change-Id: I6b03c41000b54a215f11e8527370b9a7a314cedc