These are now conditional on a config knob. We should not expect them to be present of they are disabled. Change-Id: I2ebc68db597db0fbccf9f990ceab101589a8e914
d527f998f3