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

* commit '55ac65d7eb8aec583f624241551b7b0aec2015ff':
  Fix issue 28201: Check API levels through static dispatch as well