Updated ZeroPortal to master

Change-Id: I360b7ea2fe0cf6a4c33488feee9a82c4daea9ebb