Merge "Remove TODOs for std::string removal."