Merge changes I598708a7,I93ac9648 into main

* changes:
  Expose GenericSoundModel as SystemApi.
  Add vendor UUID not null check in GenericSoundModel.