Merge "use toString instead of to_string"
am: 6a73f61b96

Change-Id: Ia28bfdf70b7a79c96822aa3f0402bc0290ad7b3d