Merge pull request #10504 from crh0716/883053

Bug 883053 - Restore the original connection when connection fails.(cherry picked from commit 1667bf5baa948cd822ee7a594867145e9818f2e5)

Conflicts:
	apps/settings/js/carrier.js