Merge "logd: clear timeout if no start time is given"