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

Change-Id: I0689d4814b4313efc294ec6fab8041b7242d98bf