Merge "Destroy both CE and DE data when corrupted." into nyc-dev
am: 436308f

* commit '436308f88b8f165f834a6b37f7638d6d4b7a6ca7':
  Destroy both CE and DE data when corrupted.

Change-Id: Ic60599ed7ee0cd200d1b95690e5e687bd403cfad