am ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev

* commit 'ed8f94fc454098889ccc6cf7745447090dc16905':
  Fix up device sounds.