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

* commit 'b94502101f6b738dd7e7aab8da664d8fd162de8a':
  Fix unused param warning