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

Change-Id: I3ff8b4f15fe7b3d22ef243e3f5379dd3d136a0f7