Updated Zero ext to master

Change-Id: If1278a17948d9fa6a1b579d968ba0e7759d2b4a4