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

Change-Id: I90950d0ecd4b5995ae513ed343f4d8b250183ff5