Merge "Fix issue 28201: Check API levels through static dispatch as well"