Handle empty control point; existing Tlogs

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