Use by default TokenAwarePolicy

Change-Id: I9b05bee2fa4efba0989d3c2dd5ce30cccee327c2