Better unknown time handling

Change-Id: Idbec11b723dbfc3cd19c8ee910eb5d2b622e22fa