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

* commit '37d894a42b5744e3e5def5fbfcc641fe3afa2063':
  Structure device not freed in error case