Merge "Permission compatibility layer for new subsystem"