Merge "Remove usage of SharedBuffer"