Merge "Guard against EOF when reading in FileBridge." into lmp-dev