Merge "Use the correct path of InvalidConfiguration"