conflicting defines

Change-Id: I294b407e00d26518cf49dfdfb72a60fe59ac311e