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

Change-Id: I5ce598586853bd9f0a597c281b66ce197543e2c1