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

Change-Id: I3781ec7c2cb9a9904acb077b81c1dc55a21a8450
tree: d2dbcdda8332b884e4f890afd9193a6e5b574abf
  1. service/
  2. PREUPLOAD.cfg