Fix table info synchronization

Change-Id: I61480ca2774e96ef03696fefa6c369438585b4cc
Fix using wrong variable

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