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

Change-Id: I1ad5c940f3981238185dbdebae388364b22cdd28