Fixes: 62137086 Test: reindex search Test: robotests Change-Id: I12e873edade80e4c0007d10352fb037b3230c643