am cc51fab7: am a2fd3128: am 61a004c0: Merge "Fix more buffer overruns."

* commit 'cc51fab7e15489e59a09e92ba39a5eec17493e20':
  Fix more buffer overruns.