Merge "st-hal: Skip second stage UBM sound model config"