Merge "Prevent modification of system fixed permissions" into mnc-dev