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

Change-Id: I12cc021a1abead960ec28354e9d6e94ea8090c88