am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying

* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying