Merge "Add new tablet sound set Bug: 7351672" into jb-mr1-dev