Merge "Do not display <unknown ssid>." into pi-dev
am: fc841b26a9

Change-Id: I7cd7067f6413743f1c8a45455310695c23665099