Updated ZeroPortal to master

Change-Id: If1781328a06c941acafc633de41219e89321868f