Merge "Fix manual connection to Carrier Wifi" into qt-dev am: d85f42a89f am: 215c231738
am: 7ed55bcefa

Change-Id: Ia85cf638bc205fc800b22ac1e4a0fad9134cc816
tree: f4eb083f23b2bc2890a0aedef7a2b5c85be3a1d8
  1. service/
  2. PREUPLOAD.cfg