Zero ext update

Change-Id: Ic9d61a64ea9bdf1c1af5d689fc78f40a638d399a
Merge "Zero ext update" into wmf/1.24wmf2