Zero Ext Update

Change-Id: I41d5ba94406d9022c87a024801f6ef6cdaa6137c