Merge "Move code around and address growable_array comment."