Merge "Avoid extra std::string copies" am: bd01d2e2d8
am: 6c0b6176cd

Change-Id: I3daa78c55c226996a13c05ea6838df6191da8278