Merge change I47aa76bf into eclair

* changes:
  Add new notifications and ringtones.