am b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb

* commit 'b324911b473d20d10c0107273721791bc8b04568':
  If 'customTokens', let authenticator handle notification.