Zero ext update

Change-Id: Ibed9bfdcd0b509f167c36a97329ccd111169a7ca
Merge "Zero ext update" into wmf/1.23wmf12