Merge "Move Resource creation out of ContextImpl constructor"