am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1

* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
  Unhide social stream permissions.