Fixed unused-parameter and shadowing warnings.

Change-Id: I70f2ab7933f47a19e1238b7a2b35538227781ecf
Merge topic 'rk-HackFest'

c59adf6 Fixed unused-parameter and shadowing warnings.