Merge "Unify the mismatch in the byte order of the address."