diff --git a/media/audioserver/audioserver.rc b/media/audioserver/audioserver.rc
index 80f78b6..4b0f6a2 100644
--- a/media/audioserver/audioserver.rc
+++ b/media/audioserver/audioserver.rc
@@ -5,3 +5,4 @@
     group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct
     ioprio rt 4
     writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
+    onrestart restart audio-hal-2-0
\ No newline at end of file
diff --git a/services/soundtrigger/SoundTriggerHalHidl.cpp b/services/soundtrigger/SoundTriggerHalHidl.cpp
index 6fe719e..e71d742 100644
--- a/services/soundtrigger/SoundTriggerHalHidl.cpp
+++ b/services/soundtrigger/SoundTriggerHalHidl.cpp
@@ -320,7 +320,7 @@
 }
 
 void SoundTriggerHalHidl::convertUuidToHal(Uuid *halUuid,
-                                           const struct sound_trigger_uuid_s *uuid)
+                                           const sound_trigger_uuid_t *uuid)
 {
     halUuid->timeLow = uuid->timeLow;
     halUuid->timeMid = uuid->timeMid;
@@ -329,7 +329,7 @@
     memcpy(halUuid->node.data(), &uuid->node[0], sizeof(uuid->node));
 }
 
-void SoundTriggerHalHidl::convertUuidFromHal(struct sound_trigger_uuid_s *uuid,
+void SoundTriggerHalHidl::convertUuidFromHal(sound_trigger_uuid_t *uuid,
                                              const Uuid *halUuid)
 {
     uuid->timeLow = halUuid->timeLow;
diff --git a/services/soundtrigger/SoundTriggerHalHidl.h b/services/soundtrigger/SoundTriggerHalHidl.h
index 9b0d7a7..60404dc 100644
--- a/services/soundtrigger/SoundTriggerHalHidl.h
+++ b/services/soundtrigger/SoundTriggerHalHidl.h
@@ -116,8 +116,8 @@
         virtual  ~SoundTriggerHalHidl();
 
         void convertUuidToHal(Uuid *halUuid,
-                              const struct sound_trigger_uuid_s *uuid);
-        void convertUuidFromHal(struct sound_trigger_uuid_s *uuid,
+                              const sound_trigger_uuid_t *uuid);
+        void convertUuidFromHal(sound_trigger_uuid_t *uuid,
                                 const Uuid *halUuid);
 
         void convertPropertiesFromHal(