Merge "Clean up permissions" into mnc-dev