sound changes from v30d

Change-Id: Ic1a00611da28f4d94b2ee67e73a20f22417ada6b