Fix malformed plugins table

Change-Id: I6d3815505e737f23147855d16910acf4fadf0435
Merge "Fix malformed plugins table"