[automerger skipped] RESTRICT AUTOMERGE: Fix removal of handle from map am: 6a8f8af9d0 -s ours am: 265ad418d1 am: 876a1960e4 am: 240950e0de -s ours
am skip reason: subject contains skip directive

Change-Id: I7090fdb441b7b42062495727853430bce2b7b56e