Merge "further remove calls to runFinalization" into honeycomb