Merge "JIT root tables."
am: 0864c98b10

Change-Id: Ic8d73f221f6d0a9b308dacb3288cccbf807d7886