Merge "Fix BufferTest.testAccess"