Merge "Remove ScopedBytes use"