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

Change-Id: I0a48a56668fea594b1dd06f9994d6817d7a85ca6