Merge "Remove unused parameters, unused variables, unused functions"
am: f02c223b66

Change-Id: I52fb76d47333e73aedfee8cc86a199806ecc7faf