Bug 911053 - Test build

Don't land this, it's for testing the merged code.