Bug 574779: [ToolService] Fix BasicToolCommandHandler

Follow-up-to: 08f43ec00d4cd05cbe6e4cecd26b0e824a742cd3
Change-Id: Ia3c3d657c9b15579d949dab502fc6a1130fada50
2 files changed