Only create non-existent control point tables

Change-Id: I9da8fdf8191e6480450d2c04c3f1498a47574b86
Merge "Only create non-existent control point tables"