Merge "WIFI cannot be automatically connected"
am: 02586ec5ab

Change-Id: I6d2cd417e8f85e1e2dbcb324ea31ffacd50a2f7d