Merge "Updates and fixes for the social stream API."