Merge "Revert "Revert "Prevent overflows for concurrent_start_bytes_ sum"""
am: 11586a595b

Change-Id: I3078429a50f9911e8458355dbca08c78db12c538