am bfb3dec2: Merge "More social integration." into ics-mr1

* commit 'bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10':
  More social integration.