am 944ada30: am 278cded6: am d2e826b5: am 65c37c81: Merge "Fixed an unused param warning"

* commit '944ada30cf18d57e301f7d62e79f51f979f6037d':
  Fixed an unused param warning