Fix incomplete ItemDisambiguationTest

Change-Id: I415a235a7700f34e08718e0a1bc58f181a0cafa2
Merge "Fix incomplete ItemDisambiguationTest"