Merge "Add carrier config test to test_defs." into mnc-dev