Merge "KeyMint: Fix timestamp token argument name."