Updated ZeroPortal to master

Change-Id: Ic9518723bba6e7b086164117a5d51154b3629185