Merge "SoundTrigger DeviceState" into udc-dev