am f3b87c2e: (-s ours) am 9112b8eb: DO NOT MERGE - Ringtone bugfixes (round 1)

* commit 'f3b87c2ebd69f96969659a4ab7f2eb55fa90189d':
  DO NOT MERGE - Ringtone bugfixes (round 1)