Merge "Revert^2 "Fix race in CommitCodeInternal and cleanup""