Merge "Add MAC for remaining service_manager functionality."