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

Change-Id: I5dda7824fcd2988f349a5d1c9df680f9be6700cb