am aecb7f84: Merge "Revert "Revert "sound trigger: several data structure updates"""

* commit 'aecb7f84cfe505403372a19c6247e34e366916ab':
  Revert "Revert "sound trigger: several data structure updates""