JsonConfig,ZeroBanner,ZeroPortal to master

Change-Id: I82234cab5791a0c720119ebd26d6c82f13d4f994