Merge "Add a carrier config to specify validation timeout for data switch."