Merge "Compare ringtones using IDs." into qt-dev am: 8be2c7def9
am: 3479d6d783

Change-Id: Id93d33caadb8967805dc6c5aa7e3f79e44247c6d