Merge changes I3aab572e,Iff9abda2

* changes:
  [AudioServer][Strategies] Fix Min/Max index overwritting
  AudioSystem: add annotation on API used by CTS media