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

Change-Id: Ibb86fe114ddd5b20bb343018f90775d90e66ad38