Merge "Blame scan request from WifiManager.reconnect()" into oc-mr1-dev
am: b509713a14

Change-Id: I31332fab42f0cc79079d15da263664bdb6254281
tree: fff9ed790b5a069d53059139bcdda71adf2c69fc
  1. service/
  2. PREUPLOAD.cfg