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

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