Merge \\"Zero out blocks if BLKSECDISCARD fails\\" into nyc-mr1-dev am: d6a39dd78a
am: a1b2949be2

Change-Id: Idf265f2e15fd5c650c73d8c9a1ca7ee26209f29a