Merge "Fix temporary key deletion after device ID attestation" into oc-dev am: 211dcefb77
am: 536b42987c

Change-Id: I438220bb32893e3fccb4150c96b5761416ee40b5