Merge "Remove unnecessary int casting"