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

* commit 'e049383decedf2b1fae17d81be51a2eca60ba0e7':