Merge "Add carrier config keys for GBA"