Update Zero to fail-safe version d5cf2a3266a285ad276cf1f7222ced678116815f

Change-Id: Ib813a688e4fb5a042d9dc62247fdec1930df4e74