Stay bound to the most current active scorer. am: b1365852cc am: d79019a616 am: 268176317b
am: 7d26ab59cd  -s ours

Change-Id: I15813561ed89e8b3f8c434a5ec2246d5cb50fab0