Merge "Explicitly pass old score to updateCapabilities" into nyc-dr1-dev am: 33a900a9 am: d15fe5cf am: dcc1a747 Change-Id: I21148f07620dbe719754036e44e450cfabd252eb