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

Change-Id: I40be62c7cb0c5802e9cfa3eb913c899c77d3df0e