Avoid coercing to key type in SafeMap am: 1adb04fd1a
am: a69976e402

Change-Id: Iac2a55b6e45eb8223560c1b67d18a1506934d1c6