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

* commit '2642652282a415662d92a53ae053251a8231f57f':
  Fix potential linear alloc memory leak