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

Change-Id: Ia53d6c2702c678baa5686f8192a78efb0d0a44f5