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

Change-Id: I52475dba3614cd089387ad1e8bd1920b42cc941e