Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev
am: e3b7240bf5

Change-Id: I037b6aac4b72dab494699fb8b69fbd3d00e9d0e0