Merge "Cameraserver: Remove unneeded groups" into nyc-mr1-dev