Revert "Updated ZeroPortal to master"

This reverts commit 9a33cbdbef08c1abb42f6d2b1167e643edfeb8e6.

Change-Id: I74d701aaadcc92633613a6eb954190f8789d0cea