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

* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
  Structure device not freed in error case