Merge "Fix wrong permission group placement under the legacy permission list." into mnc-dev