Merge "Report all permissions by type correctly"