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

Change-Id: I5ec31578bc22c1ee78f5f55f79ee06416dce2afb