(no issue) Scores revealing fixes

Change-Id: I517f45ecacc942dad85f8d7322875c18a281c7cb
Merge "(no issue) Scores revealing fixes"