Merge changes from topic "getmodelstate-redo"

* changes:
  Rolling forward with indentation fix.
  Revert "Revert "Adding getModelState API to sound trigger""