Merge "Ports DecryptedChunkFileOutput and related classes."