Updated Zero exts

Change-Id: Ic46e06646470bf59864c19acd32b3c9a089fd14c