Zero ext update

Change-Id: I6af5cc7e1fb3ce51b2ee57c4dd67ab90d5b23fc8