Remove the redundant function declarations therein. Change-Id: I27731fb70bb1abce63da761a5812f518c62f590f