am bc853c03: Merge "Close file on exception as well" into ics-mr1

* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well