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

Change-Id: I54c7cc16837e55dcfde9659cd4e8be466324d9e7