Correcting some parameters passed in function

Change-Id: Icb04be845cbc1c2b2b4ea41649233690df0bac19
Merge "Correcting some parameters passed in function"