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