Bug 951681 - Single variant build process uses invalid init.json
Merge pull request #15646 from acperez/bug-951681

Bug 951681 - Single variant build process uses invalid init.json