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

Change-Id: Ide65494bfe095533a06c4b33002fbd260306f8a0