am 8a711f2a: Remove unneeded Context argument

* commit '8a711f2a547a61b9f4f3ef3bdb79a66b618db58f':
  Remove unneeded Context argument