Merge "Wifi usability: Add two leftover entries into Wifi.proto for analysis"