Merge "Bug 1277 - Move ByteBuffUtils to separate bundle"