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

* commit 'b5331ef9bb2ae68c392e5da3da13816bd43e5b1d':
  Fix unused parameters for the Mac.