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

Change-Id: I97f57af1bbce88ff05246aa8b210d3a76350a8a7