Reset context before/after request handling

Fixes bug: #1198857

Change-Id: Id97454c72768ad80620c2738e05d3e89c75951f1
Merge "Reset context before/after request handling"