am a12dcde1: am a5f982d7: Merge "Move code around and address growable_array comment."

* commit 'a12dcde12a01561ec2fe859dd74246de3666b54c':
  Move code around and address growable_array comment.