[Bug 225734] Merge Review: esound