conflicting types for parameter

Change-Id: I97275e191a0f6d5dd00bf6cbbd906a662190f5ee