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