better zero MD (2)

Change-Id: I71929e3d2ddc9d815be556a50be86b8a0458fe79