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

Change-Id: Ib2e309fc9b52bbc8b3f27a8bdd3092492d10cf24