Merge "Don't record network name in metrics log" into pi-dev