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

Change-Id: I30bdc4f3e14158a2cbbbf883c345d39ff57e6f35