Commit fe72c1bd0c98bc5c403e867a4c284f8e66a4d10d added context to
the method above. Here we do 2 things:
1. add in the missing context to method calls
2. ensure that context is the first parameter to be consistant
Change-Id: Iad7f575a3a212f123ecdf7a4827e2ab61993a49b