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

Change-Id: Iac921cc46b197cf7ec3b2b26ec6c393ce69226bd