Merge "Compare ringtones using IDs." into qt-dev am: 8be2c7def9
am: 580e5b8949

Change-Id: Ia57aa289e9ed6416a5d92111e669e912d3a446a3