Updated ZeroPortal to master

Change-Id: If475b55fab7371d2316026f14cc036add7d94cef