Merge "Remove SocialContract, which was never used." into jb-dev