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

Change-Id: I22fb8d468ebca5d7cfe1bb023f021f8381ebb16f