Unifying BannerMessageGroup Code

Just a little bit of cleanup.

Change-Id: Ied40e3e5269ceffbb48c3d6a3b8ece411d478d7b
Making Translations work again...

There was some code rot in here. Fixing it up in preperation
for deployment.

Change-Id: Ifd5b8de41269b8f37480462b5d9e79e937217c62