Merge "Fix deleting legacy key blobs" am: c24a4b5f44 am: b3c61fac5f
am: 4d8a0decdb

Change-Id: I74ba06e7371696806a8ab1adbd7e65d806e208c4