Merge "Remove an obsolete TODO(b/196206770)" into main