Get rid of headers in context

Change-Id: I74f710eec4ac1c3a577d41cb0273079b235f6fe6
Merge "Get rid of headers in context"