Merge "CSD: clean up sound dose test API" into udc-dev