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

Change-Id: I69a00e906d6d6db9a3c69bd2d0ccbd3cf411e581