Merge "Fix unused parameter warning"
am: f71878b87b

Change-Id: Ib74a6475b9c81038931249c6e7a61f463b45b13e