Merge "Add user to channel/group modification callbacks." into oc-dev am: 1ed2771450
am: c04cb25cdb

Change-Id: Ic73c2271e9a764a032392c71a6cf46839e2c06e0