No Bug - Transplant fix from b2g18 branch to get the branding buildbot expects. a=permaorange