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

* commit '1ee1bfdeeca74d71f3e7de7ac3a7e45c9a7d0f53':
  Use __unused rather than self assignment for unused parameters.