Merge "TokenManager: use secure tokens"
am: 9074e37a8b

Change-Id: I8464efefb0cf68965b73414ec02340d6a56e9ee2