Merge changes I6c321260,I85d828a1 into main

* changes:
  protoutil: EncodedBuffer: Remove usage of PAGE_SIZE 4096
  protoutil: Fix EncodedBuffer test