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

Change-Id: I8d0dd3a9e35be24302fb620fece6127f3dcbb4a9