Merge "Fix vararg build warning"