Updated Zero exts

Change-Id: Ib7b2d9816addc4b4e560a8caa66017140c8793d2