Merge "Make grant default permission more robust." into mnc-dev