Merge "goldfish: fix authenticator id" into sc-dev