Merge "wifi proto change for some legacy API usage metrics" into qt-dev