Zero ext update

Change-Id: I8ec01d149a724625341ae4989599e13ad04bbeb1