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

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