TokenManager: use full id in token am: ff07cadffd am: d658e4a7a1
am: fe9bef64eb

Change-Id: I35a8ad5731e46aa319ed6cfd2815ba17375865fb