..because we want to use the name for the new merged interface
for the Toolkit service.

Change-Id: Ib1e193c7d04729f6420ee6984231fd50181e59d3