Merge "Canonicalize default ringtones." into qt-dev am: db44ba1e85
am: 8329ff4bd6

Change-Id: I31f088de43831338845292250c9f3a255687275a