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

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