Update Score to master

Change-Id: I1ca005821fe04a4f308a799a1e8f7a5347ce254e