Merge "Add additional mocking for Context innards" into oc-dr1-dev