Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev