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

Change-Id: Iafe64c87833b347d1229938f98ee7acf72aedcaf