Merge "Handle failure of carrier check in configure_safe_defaults()" into stable...