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

* commit '430fc1410b1680b4a341c303390c5837611a22d2':
  Fix reflection handling and test flakiness