Merge "Add a runtime flag to enable bit accounting." into nextgenv2