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

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