Updating to latest Zero extension

Change-Id: I00618ccf67ec1ef7890524c9b015918328403c69