Merge "Fix warning of unused parameter." am: c42a87ece8
am: bde0da845d

Change-Id: I4e937152e5b03575b445573024602ea056d1384b