am 021190bf: Merge "Fix reflection handling and test flakiness"

* commit '021190bf584662e75b269ef47cd48e2044e34fe4':
  Fix reflection handling and test flakiness