Updated ZeroPortal to master

Change-Id: If357e8e33379efc4a9480f03f63126481357916d