Fixing handling of null sync ID in legacy import. Part II

There was an issue with the original "fix". I actually ran
tests against Master and thus did not notice the breakage.

Bug: 2498528
Change-Id: Ic3d288a5d1d39f1ff9a9bb5a3a048c813f665fbc
1 file changed