am adab3a28: Merge "Fix reflection_test failures."

* commit 'adab3a28f6586a551634f4ff51ae4212175c45ad':
  Fix reflection_test failures.