Merge "Cached ringtone files should be mlstrustedobject." into nyc-dev