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

Change-Id: I1cd6b19a88c425aa16019b406454e7aaad4a16af