Merge "TokenManager: use secure tokens" into oc-dev
am: 4f2a82de28

Change-Id: Ie34ce9e1940904dfd2dde3e11ef1b58d76b23cea