Merge "Remove all ringtones except default on Xoom Bug: 5032006"