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

Change-Id: I31332fab42f0cc79079d15da263664bdb6254281