am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev

* commit 'f52cbb6b1800fc2b338e8c0883170567fcd0447a':
  AudioService: add fix for corrupted settings