Merge "keystore: log receipt of auth tokens"