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

Change-Id: Ic8327826fbb7199780918a7c4288193d17220dc6