Followup to fix error with 'Empty' sitelinks

Change-Id: I1dd16f6b38d2bcc948e79037367461b78df812c9
Merge "Followup to fix error with 'Empty' sitelinks"