Merge "Invoke BLKSECDISCARD to securely delete sensitive data" into oc-dev