Merge "Update setBuffer to use the new setBuffer API"