Merge "Explicitly pass old score to updateCapabilities" into nyc-dr1-dev
am: 33a900a91d

Change-Id: I23931e80b52bd9921924d44b44c4df37c971f9e4