Summary: Updated the impl and added reg test to cover all 4 combinations of ByteBuffers
Reviewed-by: ascarpino

Reviewed-by: valeriep