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

Change-Id: I6538088f10eb96c6ed3455130f296013ea50845a