For backward compatibility, filter on name field if display name is
empty

Change-Id: I489ce5f77ce0be7fa403c511f740557f0d56114c
Merge "For backward compatibility, filter on name field if display name is empty"