Merge "Fix unused parameter warning" am: f71878b87b
am: 29aa7b97f7

Change-Id: Icff794c00bd157dc65a09512cab355913697610c