Updated Zero extension

Change-Id: Ic27432e58ac28d360af15640900944b6b560ee77