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

* commit 'a2fd312840821ff4dd1e03fe4350928989e8d6e5':
  Fix more buffer overruns.