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

Change-Id: Ic0d5ac54f20e0c4b51a0c1fd7f0d98739f1267f5