Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c am: 27c5edb968
am: dab924f04d

Change-Id: I06bad134648c70f432194e163a8e0a5829f514f0