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

Change-Id: I5e546bed6d6f04846b35a365db64e263aff869dc