IServiceManager/ITokenManager uses "default" service name
am: 2567e849ca

Change-Id: I928d8e5d0293be500834474a8000efcf7612b930