Merge "logd: wrap timed entry too early, timeout immediately"