Merge "logd: wrap timed entry too early, timeout immediately" am: ae6aa1f1ed
am: 15bc48b75e

* commit '15bc48b75e7c2d40a9af5b4d1bf8c4ca9a267a79':
  logd: wrap timed entry too early, timeout immediately