Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696e
am: 30af63ccfe

* commit '30af63ccfe160852e82e71f253b7c14986eb8fd5':
  Don't free memory that shouldn't be freed.