Merge "Fix the wrong conversion of byte to int."