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

* commit '1b7ae5672053e8fac0dff5a6970d96f3d6c0578b':
  Fix reflection handling and test flakiness