Merge \"Run secdiscard on encrypted key and key blob too\" into nyc-mr1-dev
am: ec813c4e35

Change-Id: I8507fdc7e183a53d3bb129ed346cb649eddffff5