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

Change-Id: I9a90ae94cfea7c0960872403342bdef009ca8914