Merge f4495355958f588e07347a6aca2aefe76882c47a on remote branch

Change-Id: I2bd0bb97f3ddfe2f096ecb616d54c57caa43cf8a
diff --git a/sound_trigger_hw.c b/sound_trigger_hw.c
index 77af18e..85297f7 100644
--- a/sound_trigger_hw.c
+++ b/sound_trigger_hw.c
@@ -2767,7 +2767,7 @@
                 goto exit_2;
             }
 
-            st_session->f_stage_version = ST_MODULE_TYPE_CUSTOM;
+            st_session->f_stage_version = ST_MODULE_TYPE_GMM;
             st_session->vendor_uuid_info = v_info;
             handle = android_atomic_inc(&stdev->session_id);