Merge "Prevent overflows for concurrent_start_bytes_ sum"
am: 01eb773f39

Change-Id: If288c8a185e5a0e590a64cc4d9e2cef6086fb812