Merge "Add test API to override carrier config"