SL Common: narrow generics definition because of tighter java9 checks reapply r1801368
applied via r1819709