Merge "logd: missing klogd content"