Updated Zero exts

Change-Id: I3ee030fcd3f220efd15bc691e29f623162af5555