Updated Zero exts

Change-Id: Idf891a50fc2bc058cf48466bc976c3c5799240a4