icsaudio fixup for 4.3
Merge branch 'wip' into 4.3