Fix double definitions

Change-Id: I3c79beca7192fd101a7b3997d937ef9b188febcf