Merge "Close file streams" into rvc-dev am: 88d8768adf

Change-Id: If37a98eb42bd4584437f9dbdd73b3000560a5446