am 60c6b082: Merge "Remove unused parameter"

* commit '60c6b082eaa534402911adb2a5e76618e6e0e49d':
  Remove unused parameter