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

Change-Id: Ib9cb1fe29fc70c0532d9dbfa6273b7306d3bf357