Merge "Fix manual connection to Carrier Wifi" into qt-dev
am: aa697357cd

Change-Id: I32e892f8636d477b3f8e595fc01ae4a094fb0c9b