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

Change-Id: Ife736bc20d37addc045287bc3b0610fc3669c326