Merge "Unsaved carrier wifi connection should display carrier in summary" into qt-dev
am: 3d87a9920e

Change-Id: Id8c211ee34154c06cf86e7bed905a43c40098cac