Merge "logd: rework logic for LogTimeEntry"