Take care of TableBuilder TODO in QueryEngine component

Change-Id: I8599380fdc8b931a112eae98213ee402a855982d
Merge "Take care of TableBuilder TODO in QueryEngine component"