917fef6f7e
Bring in -rc4 patches so I can successfully merge the sound doc changes.
Bring in -rc4 patches so I can successfully merge the sound doc changes.