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

Change-Id: Iabeeb7535ba0ae7fe091cf657448b2f21d1bd79c