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

Change-Id: I2c36ff383fca7f1490eb2418fd1175db8ca9bc43