Merge "Remove inline access control in service_manager."