am be8c0217: Merge "Fix concurrent start bytes race"

* commit 'be8c0217c858dcabc13cefecdeced8610e3e9d6f':
  Fix concurrent start bytes race