[automerger skipped] Switch wifi to use IpClientManager. am: fbcf304583
am: 8e1cc3db3c -s ours
am skip reason: change_id If08f4cdc2b5a4a3d42bfd80aa0cbbe1424e45787 with SHA1 200a62c8f0 is in history

Change-Id: Iba487299e4ad1fa1148d43bf8c0e8c8c385bdb70
tree: 61d8d6807fc7a18da8d38954ccedacb776257e49
  1. service/
  2. PREUPLOAD.cfg