Remove unnecessary local context variables

Change-Id: I662e6e5e11dbf814755792ff64dc51aac77b7d6d
2 files changed