am 13610bec: am 1ee1bfde: Merge "Use __unused rather than self assignment for unused parameters."

* commit '13610bec6bfc0af64efdeeafc4c25d34912c2856':
  Use __unused rather than self assignment for unused parameters.