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

Change-Id: Ia2608305fbcca91fd45b1263ae4731cc57858315