Merge "esoc: Fix uninitialized count compilation error"