Also removed mClientTokens which is no longer used. Bug: 16970763 Change-Id: I4fc276241c33f88ed932ce6c703bdb3f771eb7d4