Update ZeroPortal to master

Change-Id: I0f5589496f5cf0e882066170cab2bcdb01289574
Merge "Update ZeroPortal to master" into wmf/1.24wmf20