Merge "Add use for audio_unique_id_t" into nyc-dev