Merge "Add more OWNERS to DefaultPermissionGrantPolicy"