Merge "Changed ApnSetting mappings to constants"