am 8cff1371: am b5331ef9: Merge "Fix unused parameters for the Mac."

* commit '8cff1371504170f093fe33b251e74500d335267e':
  Fix unused parameters for the Mac.