Merge "Do not trigger scan for reconnect() when wifi is connected" into oc-mr1-dev am: 87d7badd66
am: b5d55f002c

Change-Id: I890d514ca9228d1a6d5f015e4862141ddaf117a1