Merge "Always fill in root table length"
am: 47d840bcf9

Change-Id: Ib3d5aba98aa9bc309adc8b7da343c413dac097f5