Merge "logd: clear timeout if no start time is given" am: 5336d40ed4
am: b1d961a423

Change-Id: Ic5f18f9f2fe2ad575e9f923f9688ee3e94da4539