Merge "Zero out blocks if BLKSECDISCARD fails" into nyc-mr1-dev