Fix fetching of a TableBuilder after it got moved about

Change-Id: I55f04c4e81ba20c5e97236a39519ba79f38dc6d2
Merge "Fix fetching of a TableBuilder after it got moved about"