am ab528077: am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"

* commit 'ab5280776f40c473228d3e920771a41289ed7fee':
  Structure device not freed in error case