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

* commit '2b9998fb90dd687f2344248d0c9b165bb7eea1e2':
  Fix unused parameter warnings