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

Change-Id: Iad5a7cda8b73f638aa7db8ae38bdccef1cbeae85