Force flushing of buffer to file

Change-Id: I347fc5d0d0495148518c7dd557a171c26809cf40
Merge "Force flushing of buffer to file"