Merge "logd: klogd: parse error" am: c6f3b96bd8
am: c7017ffbc8

* commit 'c7017ffbc8babb7486e59f88e9b63850c5c977cb':
  logd: klogd: parse error