Merge "Remove TODOs for std::string removal." am: ceb7814c86 am: 7170d5bf24
am: 3db7ef0168

Change-Id: I527fa18f23bea5464481227bb35ec493be7eb199