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

Change-Id: I7ee62f8cb0b2144f4385bd132a3d32ecf3d918d2