Merge "Use a stub for config from carrier app if the app returns null." into sc-dev