am da993fcf: am 8d58c957: Merge "Free allocated struct after freeing field"

* commit 'da993fcf2665102435b05d6b20a4c4e8f8bd3b8f':
  Free allocated struct after freeing field