Merge "Explicitly pass old score to updateCapabilities" into nyc-dr1-dev