Merge "Fix two grant default permissions edge cases." into mnc-dev