Merge "Remove unused parameters, unused variables, unused functions" am: f02c223b66 am: 0b138d0190
am: 286986dd7c

Change-Id: I863cbe880cc252c3d94ba8d9fa8ef9a7c82b036d