Prefix tables with /*_*/

And fixed some inconsistent indents

Change-Id: Ib6acaecf40c26beb9562958feede30264af32609
Merge "Prefix tables with /*_*/"