Merge "Revert "Prevent overflows for concurrent_start_bytes_ sum"" am: ca3c6d9231
am: 0bb6edd003

Change-Id: Ibc8c110af2807724ff1a05ecab172c94ea0715c4