Merge "Set the root table size when allocating."
am: 2bafa0e575

Change-Id: Ib9a14d963790c0233bbfa416da8ad811fd8503d1