Merge "TokenManager: use secure tokens" am: 9074e37a8b am: 3cd234eef2
am: 1a7b84cf8c

Change-Id: Icc59157690b25c961290a548e0bb7c7b5f5661c7