am 30f52fea: am 67bdfa98: am d25b8502: Merge "Fix unused param warning"

* commit '30f52fea05fb91394b50793c5cb14ef05e5c94d6':
  Fix unused param warning