Merge "Remove the empty accounts group." into mnc-dev