Updated Zero ext to master

Change-Id: Ifabe35430e57bf5de9d25a1e68981ab63db6a45d