am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix...
am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev
* commit '839ca0d5':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""