Merge changes from topic "jts/amu"

* changes:
  Fix AMU non-zero counters test
  Remove unexecuted code for AMU group 1 counters