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

Change-Id: I5dc2ed6961c50e01d1690dc8cf459b2f0e0ad74a