Merge "Reduce arena memory usage when changing graph structure."
am: b4e4c279a0

Change-Id: Ic3588a7e11672992c12173fb9871263b0eeba035