Update Score to master

Change-Id: Ia52d57591241ec5aa5fec111dc8baa1019760fec