am 37f58dcc: Merge "Fix wrong index value." into jb-mr2-dev

* commit '37f58dccecd778f5af1f1f1db492c75ec5fcabd6':
  Fix wrong index value.