Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev