Merge "Fix network logging cts test." into pi-dev