Updating to ZeroBanner master

Change-Id: Iddc3d42746ba1530387d2b2c83d1dff555336ddc