am f801fa26: am adab3a28: Merge "Fix reflection_test failures."

* commit 'f801fa26084dcfb28c07bcdc2d634d72ce883306':
  Fix reflection_test failures.