Merge "Handle the case where the restore environment doesn't have the ringtone" into klp-dev