Merge "Support Allowed service info fields service type and Service policy" into main