Merge "Work around a bug with <T> ... <? extends T[]> methods."