Merge "Change 64 bit atomic counter to size_t"
am: e07b0b44d4

Change-Id: I50bddf86012ab6e482629b5db186c83de93ffbe0