Fix duplicate definitions

Change-Id: I7a6e0bad8195f123c66f3148d20275c7d9fd039b