Updating to ZeroBanner master

Change-Id: I3ccd091f0d175453cd55e61dd9d669540dd94b4a