PKI should be the default token_format

Change-Id: I01105f594dac94536b9b436f92870acd9d5ab01a
Merge "PKI should be the default token_format"