Ondemand: fix redefinition

Change-Id: I59cb1989ba8a45823f13b78139194440fe9a57e4