Updated ZeroPortal to master

Change-Id: I8f8a48b21472fe22c4cf4be5f08a27154c6d798e