am ab02f818: am 00372146: Merge "Remove unused parameter"

* commit 'ab02f818aa312f0795152449c29cb994f72e4891':