Merge "Invoke BLKSECDISCARD to securely delete sensitive data" into oc-dev
am: 28f0fd7a2d

Change-Id: I9e0ffce82703793004b6900db39ad7b5c5500ec3