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

Change-Id: Ic9bfbbcc35d4dcbcbda9bbb88d55b79f84bad7a4