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

Change-Id: I489ce5f77ce0be7fa403c511f740557f0d56114c
(cherry picked from commit 7ec5546763b79c83a2a03795f8c974119a4185d4)
Merge "For backward compatibility, filter on name field if display name is empty" into R1.10