Merge "Introduce FakeContextBuilder"