Merge "Fix non-varargs call of varargs method warning"