Merge "WIFI cannot be automatically connected" am: 02586ec5ab am: a8fafb235d
am: 341e86b12d

Change-Id: I5419df435fdbd82102580eec4f111a90ebd25a16