Merge "Fix unused parameter warning" am: f71878b87b am: 29aa7b97f7 am: 66707835ad
am: c42ab021fd

Change-Id: I840f32782480d8e945c1e9cdc3759ba6d3643f9d