Merge "Carrier config manager may be null" into main