Merge "Increase failure details for network_basic_ops"