Merge "Add no-service configuration for GB and JP"