Cleaned-up request.context code

Change-Id: I47011d30461e0d42836a882ac07896404a6cb058
Merge "Cleaned-up request.context code"