base

Minor cleanups to delete support.

When deleting by key, make a defensive copy of selection...probably fixing a latent bug.

Bug: 28173827
Change-Id: Ib1ad2214c1f95fa703be227da33b25a5d4021b28