Merge "Fix enterprise path permission checking" into mnc-dev