Update zero ext

Change-Id: I84482f08ca7d2f5eee49f3bf1980bcf6f3bfb1ab
Merge "Update zero ext" into wmf/1.22wmf8