am d03548d4: am 123ad6d1: Merge "Remove unused parameter warnings." into klp-dev

* commit 'd03548d4ca505161da0156c858943716988a19e7':
  Remove unused parameter warnings.