Updated ZeroPortal to master

Change-Id: I3d6acbc0d38f4731e6f091de103e5eba31650bdc