am 6637c564: Merge "Add carrier config test to test_defs." into mnc-dev

* commit '6637c564a4ee458cb11c01b57622b3d0a7370aec':
  Add carrier config test to test_defs.