Match BeanStalk as we are removing EOS Weather.

Change-Id: I05db78a2109ed1e7c52e342407fc29574878e3f5