am 8a8a4055: am 541641d0: Merge "Fix counting" into lmp-mr1-dev automerge: 5c8d135

* commit '8a8a40556ea3b0fb4cc8cd1ec063fb9988db497f':
  Fix counting