Merge "Fix unwanted sign-extention when converting byte -> int"