Merge "Replaceable mac_permission.xml support"