am 4329ee25: Merge "Fix off by one error in log tracking" into jb-mr2-dev

* commit '4329ee25659c27b1cd90f95f127192964346e471':
  Fix off by one error in log tracking