Introduce Context

Change-Id: I0f3d6c07cd26344a8c566f5bd71fe21ff65e0d5b
Merge "Introduce Context"