Fix table info synchronization

Change-Id: I61480ca2774e96ef03696fefa6c369438585b4cc
Merge "Fix table info synchronization"