Merge changes I12244fd8,I53ddc0a4

* changes:
  Reuse setSystemAudioMode() in terminateSystemAudioMode()
  Handle amplifier ends system audio control