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

Change-Id: I7eca7005e438e1c75ae3daeecfa08a0432050b81