Update Score to master

Change-Id: I1cfb75aa11044e530f4919b587e2c3fa3ea610ce