Bundling in latest social_networking changes for testing.