Remove unneeded Context argument

Change-Id: Ib34931836a617d0dc049fb3c9ae6686374ec8c12
5 files changed