Merge "DefaultNetworkEvent: fix two bugs with validation times"