Merge "Stops the loop when all files are closed." am: d8d7fc6717 am: 920b02906f am: ac982d2644
am: 6d0e37cf1b

Change-Id: I699e905344bec05c3375afb03c47021a4b1b139d