Merge \"Fix #29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev
am: 464f7e4983

Change-Id: I1f3c6bd4eb3aa6ff5fb3313cd754ad71ed42b47f