Merge "Fix reflection_test failures."