Merge "Change 64 bit atomic counter to size_t"