Merge "DefaultNetworkEvent: fix two bugs with validation times"
am: c0d951c3e0

Change-Id: I94489cb28fad5d8adddb200b44d72bab2be70b97