Handle empty control point table; existing Tlogs

Change-Id: I358274471522ac568666c31b41b0eb33b5a16ce7
Merge "Handle empty control point table; existing Tlogs"