Merge "Return RESULT_OK when wifi connection established" into jb-mr1-dev