Fixed two duplicate functions

Change-Id: Ia2920ca932bf6262bf825bfe4e79d39dc602fd63