Merge "Pass correct size of integer to CallVoidMethod." into oc-dev