Merge "Sort channels and groups by id" into oc-dev
am: 665c1ced58

Change-Id: I3878ed917d63b9454b332f714ac83054452fab31