Additional modification for 64-bit buffers.
Additional modification for 64-bit buffers.

rbaghdadi/tiramisu,rbaghdadi/ISIR,rbaghdadi/tiramisu,rbaghdadi/ISIR,rbaghdadi/COLi,rbaghdadi/tiramisu,rbaghdadi/tiramisu,rbaghdadi/COLi