Bring back sound

Change-Id: I92b3229497c390d0eddb3b3edaf82960525ba25f