am 0a9c5fdc: Merge "Fix thread checkpoint issue"

* commit '0a9c5fdc671616dbe5c2b2b2f88fa0ad7c65876c':
  Fix thread checkpoint issue