Updated Zero ext

Change-Id: I153a4b9919664bd5a5d07db52744cf3bde142a29