Make token_format=PKI the default

Change-Id: I00224cae70b6c276e187d1ac5ecfb9300904964f