Update zero ext

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