Merge "Don't try caching null ringtones." into nyc-dev