am ef1945f8: am 417e3041: am 8124e073: Merge "Fix unused parameter warnings"

* commit 'ef1945f8e9fc3b5aab9bf9b0bda83517a906f4fe':
  Fix unused parameter warnings