Bring back CM old sounds

Change-Id: I1553a7572218dd97e677a4f4ee5206acb579e0ce