Merge "Wifi connection hysteresis" into oc-mr1-dev
am: d15f2481be

Change-Id: If52888017ec1082175152f3c474f52ce13f08654