Merge "Wifi Usability Metrics Proto Update"