Merge "Rename tool's name" am: 08ac866859 am: 4152af8c2d
am: 801ec0f0be

Change-Id: I1206d31b9d9937d660c11c4365ac9a4e24c2b47c