Update ContributionReporting to master

Change-Id: I3e41d7ba6b7c04f05ef0a6b9c3760e364c9879a3