Merge "Catch exceptions when writing to persistent storage in CDM"