Updated ZeroPortal to master

Change-Id: Ib653999ee08399c99223cb1d9af20b57923f76bb