This array is only conditionally partially filled, but then
unconditionally copied, so we need to zero it out.
closes#1839
Change-Id: I38662ed094aad776a68ad0c2eb947fd598bc4c57
(cherry picked from commit 860ce31f63)
(cherry picked from commit b5a9b55962)