Merge "Add a std::string overload to Next." am: f530dbf671
am: 928db53b44

Change-Id: I360318fd68235ca0cc524fd482249a12bc7f2257