Merge change 8642

* changes:
  Fix issue 2001517: AudioTrack compatibility issue.