Update ZeroPortal to master

Change-Id: I4d7bbdf66779b50191a43c595aea0bd4c0825bab