Merge "Revert "Revert "Prevent overflows for concurrent_start_bytes_ sum""" am: 11586a59 am: b883c966 am: 5c3cdf7a Change-Id: Ifb1f1f9de208ae1ce470b6c9c0497529243e2a97