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

Change-Id: Ib025c543071df6c0e47045cfd2c148879075b411