Fix issues with marketplace build
Fix issues with marketplace build

lmorchard/high-fidelity,sole/high-fidelity,mozilla/high-fidelity,sole/high-fidelity,mozilla/high-fidelity,prateekjadhwani/high-fidelity,lmorchard/high-fidelity,sole/high-fidelity,prateekjadhwani/high-fidelity,sole/high-fidelity