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

Change-Id: I0cb0cbff94b206655061c078848c0ff95147fcfc