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

* commit '9be4962060ca67c4fe9bfc391043f6d2829cf720':
  Unhide social stream permissions.