Revert "Updated ZeroPortal to master"

This reverts commit f641c3722ff822a725e35bec9721c5b3eb9c7899.

Change-Id: I94d14b675096136fde2e5b6b9110c4d13bc5fe3d