Merge "Small fixes in PermissionControllerManager/Service"