am 5d8d3981: Merge "Start authenticator numbering from 1, instead of 2."

* commit '5d8d398186c87f91de9d1a3384c2a5fdde05fd6a':
  Start authenticator numbering from 1, instead of 2.