Updated ZeroPortal to master

Change-Id: I67f77da1245eb9362c7f776be70dc37bc84eda27