Do not queue empty other index jobs

Change-Id: I00347b8cc3e7821553242700bab5c44d00f71db7
Merge "Do not queue empty other index jobs"