Updating Zero to the master branch

Change-Id: Iac5776368f048a0467f361aa0dec74262de6ee5f