[automerger skipped] RESTRICT AUTOMERGE: Fix removal of handle from map am: 6a8f8af9d0 -s ours am: 265ad418d1

Change-Id: I541a47aa907d23ffbeaab84a288a8532b5934324