DO NOT MERGE - Ringtone bugfixes (round 1)

Change-Id: Idb72659b9cb00ec141b1229f42951e0a6e0b9a9a
3 files changed