Merge "logd: klogd: parse error"