Merge "Remove the empty accounts group and not needed storage resources." into mnc-dev