Updated ZeroPortal to master

Change-Id: I7d0d7d4886141f1a31322337a50761418c07ec42