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

* commit '0c9dc552921bf50d62c8b81084a703ac07e48cd6':