Push counter updates to transaction end to avoid contention

Change-Id: I3d8ace509ec0a9471cc68be3398bb1c108d6e570
Merge "Push counter updates to transaction end to avoid contention"