IServiceManager/ITokenManager uses "default" service name
am: 1899688a7c

Change-Id: I0520b6a57f5d07ea0f8df704de67a7321ea2caa7