Don't pass arguments to methods that don't need them

Change-Id: Id6a16ab162cc6a7fd9c56e8591de74a78e662099
Merge "Don't pass arguments to methods that don't need them"