am d8d65b1b: am ea930516: am dc999df9: Merge "More fixed-length buffer removal."

* commit 'd8d65b1be45112667f450826d34a32b76561895c':
  More fixed-length buffer removal.