The name_or_id field might be a unicode string. Make sure we don't
run into problems comparing it by converting all comparison objects.
This is a follow-on to Id89bbf6306adebe96c1db417a4b8b5ae51023af0 based
on/as an alternative to I546b1fbd3375861173f411a7cfdb9e1baa5e6250
Closes-Bug: 1668849
Change-Id: I4e7fa49bd8525148961f02b0e0d7b567145a68b6
Co-Authored-By: Liu Qing <liuqing@chinac.com>