Merge "Start authenticator numbering from 1, instead of 2."