Zero update

Change-Id: I2344f8d734e8a02781ed6f9bf2d0cb03e944639d