Avoid double-free/double-fclose on error. am: 332513d0 am: 6c5b3c3f am: 8d222cd4 am: e1b95886 am: 85ec116a Change-Id: I6e0ac3d3bd9cc300c56eea42875aa96e508552d3