Merge "Fix deleting legacy key blobs"
am: c24a4b5f44

Change-Id: I7003a474706ce4ad018e9568db6fda448ee378f7