Merge "Revert "Provide APIs to allow reusing the passed buffer."" am: 79c77365 am: bb938377 am: 7d1fffc6 am: 6337efe1 Change-Id: I6538088f10eb96c6ed3455130f296013ea50845a