Update ContributionTracking to master

Change-Id: I42da435f48809b6ce8fdc8303f963298c9f226e9