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

Change-Id: I952e078e3e72388aad413786616ede3f5b9bd3c1