Merge "Fix potential linear alloc memory leak"
am: 6ba1d6834c

* commit '6ba1d6834c7457cccf00e2a8faf4846b23a05094':
  Fix potential linear alloc memory leak