Merge "An argument is handled incorrectly for add-int/lit8 during optimization phase"