Merge "Revert "Provide APIs to allow reusing the passed buffer."" am: 79c7736557 am: bb9383774e
am: 7d1fffc633

Change-Id: Iccb4b42586480eb12739cc9d52164d3311fb3e30