Merge "Revert "Adding getModelState to soundtrigger with build fix.""