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

* commit '6a622dcf18fcb025766e26e1ac7b3138f92dc6e6':
  Fix wrong index value.