HACK: Disable secure discard
 * Secure discard is causing wipes to take insane amounts of time.
 * Enable this workaround until the problem is sorted.

Change-Id: If9bbb27fd5476a160e9d7e8b29ab20a851410ff7
Merge branch 'cm-11.0' into martincz