Merge "remove special case code for groups." into nyc-dev
am: 9bb991a

* commit '9bb991a3bb95a2690483ee8783afe3982ff121c0':
  remove special case code for groups.

Change-Id: I8c215b2dab49aee92c06f7f5721da5e2d255d1c4