Followup to fix error with 'Empty' sitelinks

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