Avoid coercing to key type in SafeMap
am: 1adb04fd1a

Change-Id: I0bec7d72b24289ff9bfd75998406769a1d840655