Merge "entry_name_utils-inl.h: clear top bit before shifting" am: a72477630d am: a5ff3e1276
am: 15d1c2ec65

Change-Id: I34998ad0a29161043574570a0e0c7a9ee8bebad3