Merge "Fix stream not being closed on all exception paths."
am: db9197b

* commit 'db9197b2f25f519988097949c3f9c0fe9b7f973d':
  Fix stream not being closed on all exception paths.

Change-Id: Ia8f0f376e59d0618652b1f0ee243cb1df892212b